added AC_LIBTOOL_WIN32_DLL as a preparation for proper builds of shared

2006-08-25  Michael Schumacher  <schumaml@cvs.gnome.org>

	* configure.ac: added AC_LIBTOOL_WIN32_DLL as a preparation for
	proper builds of shared libs on win32 & there's no need to define
	OS_WIN32 here...
	* babl/babl-extension.c:  ...if the only place where it is needed
	can be handled by HAVE_DLFCN_H

diff --git a/ChangeLog b/ChangeLog
index 1930f106aaa96f92bb7f754139667399b1587376..6dbbfdd6045e2c6b02ac97a19525049d84b68a9d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-08-25  Michael Schumacher  <schumaml@cvs.gnome.org>
+
+       * configure.ac: added AC_LIBTOOL_WIN32_DLL as a preparation for
+       proper builds of shared libs on win32 & there's no need to define
+       OS_WIN32 here... 
+       * babl/babl-extension.c:  ...if the only place where it is needed
+       can be handled by HAVE_DLFCN_H
+
 2006-08-24  Øyvind Kolås  <pippin@gimp.org>
 
        * extensions/Makefile.in:

diff --git a/babl/babl-extension.c b/babl/babl-extension.c
index 9fbac8a98b9119df7103a08e7bb7af4efc57f132..2352586e80d3214f029acbc4e8659b9fa626e8e9 100644 (file)
--- a/babl/babl-extension.c
+++ b/babl/babl-extension.c
@@ -138,7 +138,7 @@ destroy_hook (void)
 #include <sys/stat.h>
 #include <unistd.h>
 
-#ifndef OS_WIN32
+#ifdef HAVE_DLFCN_H
 #include <dlfcn.h>
 #else
 void  *dlopen(const char *, int);

diff --git a/configure.ac b/configure.ac
index 4a9bb9202c045b4bd8c4b14b3de6dabe2d8b76f1..d77a5e68b8a49086bf08ef51a74e47c2f84e2411 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -32,6 +32,7 @@ AM_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE(no-define)
 
 AC_PROG_CC
+AC_LIBTOOL_WIN32_DLL
 AM_PROG_LIBTOOL
 AC_STDC_HEADERS
 AM_SANITY_CHECK
@@ -125,8 +126,6 @@ AC_MSG_RESULT([$os_win32])
 AC_SUBST(PATHSEP)
 
 AM_CONDITIONAL(OS_WIN32, test "$os_win32" = "yes")
-AC_DEFINE(OS_WIN32, 1, "Define to 1 if you are compiling for Microsoft Windows.")
-
 AM_CONDITIONAL(OS_UNIX, test "$os_win32" != "yes")
 
 dnl ===========================================================================